Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Tue, 14 Feb 2012 18:20:05 +0000 (10:20 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Tue, 14 Feb 2012 18:20:05 +0000 (10:20 -0800)
commita61937ebb2ec67a265d1f87fbff5cbca1445db7c
treee8d8720ce1c7e853cd8195b4f85d55cc06499ab1
parent1b489f0e733023afaff629746f2d4cb75d8ada68
parent7e30f46e3de0ab424bdbe986c1f3cbb4791d4168
Merge from trunk.